git merge conflict

visit shbcf.ru